Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use name from theme when downloading/printing twofactor backup codes. #14829

Merged
merged 1 commit into from
Mar 27, 2019
Merged

Use name from theme when downloading/printing twofactor backup codes. #14829

merged 1 commit into from
Mar 27, 2019

Conversation

fancycode
Copy link
Member

This helps for people that have twofactor backup codes from different portals (with different names).

ChristophWurst
ChristophWurst requested changes Mar 25, 2019
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool!

@ChristophWurst ChristophWurst force-pushed the backupcodes-theme-name branch from 90620f1 to 10aab0c Compare March 26, 2019 15:46
ChristophWurst
ChristophWurst approved these changes Mar 26, 2019
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

I rebased & squashed

@faily-bot
Copy link

faily-bot bot commented Mar 26, 2019

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 17323: failure

ENABLE_REDIS=true, TESTS=nodb-codecov

Show full log 
There were 2 failures:

1) Test\L10N\FactoryTest::testGetL10nFilesForApp with data set #3 ('settings', 'de', array('/drone/src/github.com/nextclo...e.json'))
Failed asserting that Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/core/l10n/de.json'
) is identical to Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/settings/l10n/de.json'
).

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:459

2) Test\L10N\FactoryTest::testFindL10NDir with data set #3 ('settings', '/drone/src/github.com/nextclo.../l10n/')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/drone/src/github.com/nextcloud/server/settings/l10n/'
+'/drone/src/github.com/nextcloud/server/core/l10n/'

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:481

DB=NODB, ENABLE_REDIS=true, PHP=7.1

Show full log 
There were 2 failures:

1) Test\L10N\FactoryTest::testGetL10nFilesForApp with data set #3 ('settings', 'de', array('/drone/src/github.com/nextclo...e.json'))
Failed asserting that Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/core/l10n/de.json'
) is identical to Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/settings/l10n/de.json'
).

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:459

2) Test\L10N\FactoryTest::testFindL10NDir with data set #3 ('settings', '/drone/src/github.com/nextclo.../l10n/')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/drone/src/github.com/nextcloud/server/settings/l10n/'
+'/drone/src/github.com/nextcloud/server/core/l10n/'

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:481

DB=NODB, ENABLE_REDIS=false, PHP=7.2

Show full log 
There were 2 failures:

1) Test\L10N\FactoryTest::testGetL10nFilesForApp with data set #3 ('settings', 'de', array('/drone/src/github.com/nextclo...e.json'))
Failed asserting that Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/core/l10n/de.json'
) is identical to Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/settings/l10n/de.json'
).

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:459

2) Test\L10N\FactoryTest::testFindL10NDir with data set #3 ('settings', '/drone/src/github.com/nextclo.../l10n/')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/drone/src/github.com/nextcloud/server/settings/l10n/'
+'/drone/src/github.com/nextcloud/server/core/l10n/'

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:481

DB=NODB, ENABLE_REDIS=false, PHP=7.3

Show full log 
There were 2 failures:

1) Test\L10N\FactoryTest::testGetL10nFilesForApp with data set #3 ('settings', 'de', array('/drone/src/github.com/nextclo...e.json'))
Failed asserting that Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/core/l10n/de.json'
) is identical to Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/settings/l10n/de.json'
).

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:459

2) Test\L10N\FactoryTest::testFindL10NDir with data set #3 ('settings', '/drone/src/github.com/nextclo.../l10n/')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/drone/src/github.com/nextcloud/server/settings/l10n/'
+'/drone/src/github.com/nextcloud/server/core/l10n/'

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:481

@ChristophWurst ChristophWurst added this to the Nextcloud 16 milestone Mar 27, 2019
@juliusknorr
Copy link
Member

Drone restarted.

@rullzer rullzer merged commit 87fbaf5 into master Mar 27, 2019
@rullzer rullzer deleted the backupcodes-theme-name branch March 27, 2019 18:59
@rullzer rullzer mentioned this pull request Mar 27, 2019
Merged
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@juliusknorr juliusknorr juliusknorr approved these changes

@rullzer rullzer Awaiting requested review from rullzer

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug
Projects
None yet
Milestone
Nextcloud 16
Development

Successfully merging this pull request may close these issues.
4 participants
@fancycode @juliusknorr @ChristophWurst @rullzer